Code cleanup
Version 0.5.3