Organize whitespaces

1. 4 space -> 2 space
2. Removed trailing whitespaces