Cleaned up code for future options