Clean UP

Code Clean UP
Crash Fix