Reorganize variables and data types
Remove View Usages