Refactored project, optimizing for android