Cleaned up kinda