Cleaned up the code. IT somewhat got a bit less accurate.