Cleaned some code
Nitpicked some codes