Removed pointless setup method. Some code-style issues