alpha ~ 0.38.4
+ General Code Cleanup