Starting cleanup for best practices