Cleaned up features and command line