Fixed Codestyle Issues