Source code clean up
-a