Comments removed and code format