*cleaned up* code