removed redundant manifest stuff
minor modifications
Getting the code prettier for release