Cleaned up code and updated icon