Cleanup code + added styling