some cleanups and making the project more friendly