Codebase cleanup

All code has been cleaned up: removed unused and leftover imports, removed
unnecessary type specifications on non-public members, removed unnecessary
parentheses, renamed some members to better explain what they do, etc... Just
basic changes, nothing too important here.