Cleaned up code, updated list and added new func