Cleaned up config and bootstrap file