(Src) : cleanup

- cleaned up main