Simplify and clean up the code#548

boyter merged 1 commit intoboyter:masterboyter/scc:masterfrom

apocelipes:simplify-and-clean-upapocelipes/scc:simplify-and-clean-upCopy head branch name to clipboard