Fixed unneeded code and kept basic design