Initial work

codestyle } else {