Moving close curly brace to end of class