Tidy up source code

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>