Cleaned up some code

Signed-off-by: Daniel <Daniel@146.57.196.80>