Cleanup & styling