Cleanups

Minor clenaups
More work :)
Will be needed later, saving space in the future.