Cleaned up code regarding enums and cleaned up native logic