Cleaned up a bit :)