Removed obsolete code
Source formatting