Cleaned up visuals and code