Change private property/method naming convention to psr0, Added helper methods, Fixed class including bug