Fix nil in post view
Cleanup and CS