Added getters and cleaned up WebController