Cleaned up a bit this file