Cleaner beta

Please Merge it!