Improve code
Epic Fail Improve code