Name some more methods
Name command methods
Remove unnecassary trailing return statements
Fix conversion errors
Rename some variables
Fix typo