Clean up (code conventions, remove unused code, unnecessary specs)