Clean up && revamp