Change in creation. Remove duplicated code, unusefull code and pep-8 conformance
Remove limitation for debugging