Removed mix cased methods to comply with PEP8. Fix various bugs